ci: Update the version of Meson in our Docker image
authorEmmanuele Bassi <ebassi@gnome.org>
Wed, 8 Apr 2020 11:26:58 +0000 (12:26 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 8 Apr 2020 11:26:58 +0000 (12:26 +0100)
Needed for !1017.

.gitlab-ci.yml
.gitlab-ci/fedora.Dockerfile

index 857586f6fc8683876eb3ac1f7c36c803388847a9..a411a7dadbb5c62c4223465d17ebe98016979ecb 100644 (file)
@@ -27,14 +27,14 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
   stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
   stage: build
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
@@ -66,7 +66,7 @@ fedora-x86_64:
     <<: *cache-paths
 
 release-build:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
   stage: build
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
@@ -168,7 +168,7 @@ flatpak-master:icon-browser:
   <<: *flatpak-master
 
 static-scan:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
   stage: analysis
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
@@ -181,7 +181,7 @@ static-scan:
   allow_failure: true
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
   stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
index a21549473b4fc3822eec6f6100180c1b6ca481ba..f5bb9ef6dd40571b6e7e72449a69408ced5b48be 100644 (file)
@@ -82,7 +82,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.52.1
+RUN pip3 install meson==0.53.1
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}